fix: Retain existing join and init kubeadm config when adding taints #1073
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously a dodgy piece of logic overwrote the whole of the join and init kubeadm config when adding taints due to an incorrect `!=` which should have been `==`.
jimmidyson
force-pushed
the
jimmi/fix-taints
branch
from
d1adbee to
654197d
Compare
fatz
approved these changes
Mar 14, 2025
dkoshkin
approved these changes
Mar 14, 2025
Merged
faiq
pushed a commit
that referenced
this pull request
Apr 10, 2025
🤖 I have created a release *beep* *boop* --- ## 0.28.0 (2025-04-10) <!-- Release notes generated using configuration in .github/release.yaml at main --> ## What's Changed ### Exciting New Features 🎉 * feat: Update all addon versions by @jimmidyson in #1054 * feat: go 1.24.1 and update all other tools by @jimmidyson in #1066 * feat: bumped frr-routing to 9.1.3 by @ArvinderPal09 in #1067 * feat: properly support kube-vip upgrades by @dkoshkin in #1062 * feat: update addons by @dkoshkin in #1072 * feat: enable Cilium's hubble relay mTLS by @dkoshkin in #1086 * feat: adds image tempalting for capx by @faiq in #1096 * feat: support setting kubeadm ignorePreflightErrors by @dkoshkin in #1097 * feat: go 1.24.2 to fix CVE by @jimmidyson in #1100 * feat: update Calico to v3.29.3 by @dkoshkin in #1101 ### Fixes 🔧 * fix: correctly handle multiple registries with the same Host by @dkoshkin in #1063 * fix: Tolerate all NoSchedule taints for NFD and CSI deployments by @jimmidyson in #1074 * fix: Retain existing join and init kubeadm config when adding taints by @jimmidyson in #1073 ### Other Changes * build: Update k8s versions for tests by @jimmidyson in #1052 * docs: updates cilium doc with link to its default spec by @manoj-nutanix in #1036 * ci: Replace deprecated blackduck scan action by @jimmidyson in #1070 * build: Update k8s.io/{kubelet,utils} deps by @jimmidyson in #1078 * revert: "build: Update k8s.io/{kubelet,utils} deps" by @jimmidyson in #1080 * ci: Enable dependabot for hack/tools module by @jimmidyson in #1082 * build: Update k8s.io/kubelet dep by @jimmidyson in #1081 * ci: Use Kubernetes minor in e2e check name by @jimmidyson in #1090 ## New Contributors * @ArvinderPal09 made their first contribution in #1067 **Full Changelog**: v0.27.1...v0.28.0 --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Dimitri Koshkin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously a dodgy piece of logic overwrote the whole of the join and init
kubeadm config when adding taints due to an incorrect
!=which should havebeen
==.